From a42b63ea4a551a47e990e9d2526deda1898b8cf4 Mon Sep 17 00:00:00 2001 From: parkrrrr Date: Fri, 25 Jul 2003 16:41:11 +0000 Subject: [PATCH] remove almost all references to stderr; make them all either fatal() or warning() --- gpsbabel/arcdist.c | 2 +- gpsbabel/csv_util.c | 7 ++++--- gpsbabel/defs.h | 6 +++++- gpsbabel/gcdb.c | 2 +- gpsbabel/gpsdrive.c | 5 +++-- gpsbabel/magproto.c | 18 +++++++++--------- gpsbabel/mapsend.c | 6 ++---- gpsbabel/polygon.c | 4 +++- gpsbabel/tmpro.c | 8 ++++---- gpsbabel/util.c | 8 ++++++++ 10 files changed, 40 insertions(+), 26 deletions(-) diff --git a/gpsbabel/arcdist.c b/gpsbabel/arcdist.c index 6bf769447..2e21ae904 100644 --- a/gpsbabel/arcdist.c +++ b/gpsbabel/arcdist.c @@ -194,7 +194,7 @@ arcdist_process(void) argsfound = sscanf( line, "%lf %lf", &lat2, &lon2 ); if ( argsfound != 2 && strspn(line, " \t\n") < strlen(line)) { - fprintf( stderr, "%s: Warning: Arc file contains unusable vertex on line %d.\n", MYNAME, fileline ); + warning(MYNAME ": Warning: Arc file contains unusable vertex on line %d.\n", fileline ); } else if ( lat1 != BADVAL && lon1 != BADVAL && lat2 != BADVAL && lon2 != BADVAL ) { diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c index f358626c2..77ebc90df 100644 --- a/gpsbabel/csv_util.c +++ b/gpsbabel/csv_util.c @@ -221,8 +221,9 @@ csv_lineparse(const char *stringstart, const char *delimited_by, } if (enclosedepth != 0) { - fprintf(stderr, "%s: Warning- Unbalanced Field Enclosures (%s) on line %d\n", - MYNAME, enclosed_in, line_no); + warning(MYNAME + ": Warning- Unbalanced Field Enclosures (%s) on line %d\n", + enclosed_in, line_no); } return (tmp); @@ -493,7 +494,7 @@ xcsv_parse_val(const char *s, waypoint *wpt, const field_map_t *fmp) /* wpt->gc_data.type = gs_mktype(s);*/ } else { - fprintf (stderr, "UNKNOWN STYLE DIRECTIVE: %s\n", fmp->key); + warning( MYNAME ": Unknown style directive: %s\n", fmp->key); } } diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h index 273183b3f..cbccd7863 100644 --- a/gpsbabel/defs.h +++ b/gpsbabel/defs.h @@ -285,7 +285,11 @@ void fatal(const char *, ...) __attribute__ ((__format__ (__printf__, 1, 2))) #endif ; - +void warning(const char *, ...) +#if __GNUC__ + __attribute__ ((__format__ (__printf__, 1, 2))) +#endif + ; ff_vecs_t *find_vec(char *, char **); void disp_vecs(void); void disp_formats(int version); diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.c index 74be7d46a..eb0c01a86 100644 --- a/gpsbabel/gcdb.c +++ b/gpsbabel/gcdb.c @@ -177,7 +177,7 @@ data_read(void) tm = be_read32(recdata) * 24 * 3600; tm -= EPOCH_1904; wpt->creation_time = tm; - fprintf(stderr, "date %d\n", tm); + warning( "date %d\n", tm); } break; #endif diff --git a/gpsbabel/gpsdrive.c b/gpsbabel/gpsdrive.c index fa18191e6..2db56a99b 100644 --- a/gpsbabel/gpsdrive.c +++ b/gpsbabel/gpsdrive.c @@ -112,8 +112,9 @@ data_read(void) wpt_tmp->icon_descr_is_dynamic = 1; break; default: - fprintf (stderr, "%s: Warning: unmapped data fields on line %d.\n", - MYNAME, linecount); + warning(MYNAME + ": Warning: unmapped data fields on line %d.\n", + linecount); break; } i++; diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c index 90d66e07d..b9b3af6be 100644 --- a/gpsbabel/magproto.c +++ b/gpsbabel/magproto.c @@ -256,7 +256,7 @@ mag_writemsg(const char * const buf) char obuf[1000]; if (debug_serial) { - fprintf(stderr,"WRITE: $%s*%02X\r\n",buf, osum); + warning("WRITE: $%s*%02X\r\n",buf, osum); } retry: @@ -268,7 +268,7 @@ mag_writemsg(const char * const buf) mag_readmsg(); if (last_rx_csum != osum) { if (debug_serial) { - fprintf(stderr, "COMM ERROR: Expected %02x, got %02x", + warning("COMM ERROR: Expected %02x, got %02x", osum, last_rx_csum); } if (retry_cnt--) @@ -299,7 +299,7 @@ mag_writeack(int osum) i = sprintf(obuf, "$%s*%02X\r\n",nbuf, nsum); if (debug_serial) { - fprintf(stderr,"ACK WRITE: %s",obuf); + warning("ACK WRITE: %s",obuf); } /* * Don't call mag_writemsg here so we don't get into ack feedback @@ -386,7 +386,7 @@ retry: * we'll be fairly persistent in retrying. */ if (retrycnt--) { - fprintf(stderr, "%d\n", retrycnt); + warning( "%d\n", retrycnt); goto retry; } else { fatal(MYNAME ": No data received from GPS.\n"); @@ -403,7 +403,7 @@ retry: if (isz < 5) { if (debug_serial) - fprintf(stderr, "SHORT READ %d\n", isz); + warning( "SHORT READ %d\n", isz); return; } mag_error = 0; @@ -413,14 +413,14 @@ retry: isum = strtoul(isump, NULL,16); if (isum != mag_pchecksum(&ibuf[1], isz-3)) { if (debug_serial) - fprintf(stderr, "RXERR %02x/%02x: '%s'\n", isum, mag_pchecksum(&ibuf[1],isz-5), ibuf); + warning( "RXERR %02x/%02x: '%s'\n", isum, mag_pchecksum(&ibuf[1],isz-5), ibuf); /* Special case receive errors early on. */ if (!got_version) { fatal(MYNAME ": bad communication. Check bit rate.\n"); } } if (debug_serial) { - fprintf(stderr, "READ: %s\n", ibuf); + warning( "READ: %s\n", ibuf); } if (IS_TKN("$PMGNCSM,")) { last_rx_csum = strtoul(&ibuf[9], NULL, 16); @@ -453,7 +453,7 @@ retry: } mag_error = 0; if (!ignore_unable && IS_TKN("$PMGNCMD,UNABLE")) { - fprintf(stderr, "Unable to send\n"); + warning( "Unable to send\n"); found_done = 1; mag_error = 1; ignore_unable = 0; @@ -1180,7 +1180,7 @@ mag_waypt_pr(const waypoint *waypointp) if (!is_file) { if (mag_error) { - fprintf(stderr, "Protocol error Writing '%s'\n", obuf); + warning( "Protocol error Writing '%s'\n", obuf); } } } diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c index 65691bec2..d1cb83b7e 100644 --- a/gpsbabel/mapsend.c +++ b/gpsbabel/mapsend.c @@ -58,8 +58,7 @@ mapsend_rd_init(const char *fname, const char *args) { mapsend_file_in = fopen(fname, "rb"); if (mapsend_file_in == NULL) { - fprintf(stderr, "Cannot open '%s' for reading\n", fname); - exit(1); + fatal( MYNAME ": Cannot open '%s' for reading\n", fname); } } @@ -174,8 +173,7 @@ mapsend_wr_init(const char *fname, const char *args) { mapsend_file_out = fopen(fname, "wb"); if (mapsend_file_out == NULL) { - fprintf(stderr, "Cannot open '%s' for writing\n", fname); - exit(1); + fatal(MYNAME ": Cannot open '%s' for writing\n", fname); } mkshort_handle = mkshort_new_handle(); route_wp_count = 0; diff --git a/gpsbabel/polygon.c b/gpsbabel/polygon.c index 4386cad18..411484386 100644 --- a/gpsbabel/polygon.c +++ b/gpsbabel/polygon.c @@ -219,7 +219,9 @@ polygon_process(void) argsfound = sscanf( line, "%lf %lf", &lat2, &lon2 ); if ( argsfound != 2 && strspn(line, " \t\n") < strlen(line)) { - fprintf( stderr, "%s: Warning: Polygon file contains unusable vertex on line %d.\n", MYNAME, fileline ); + warning(MYNAME + ": Warning: Polygon file contains unusable vertex on line %d.\n", + fileline ); } else if ( lat1 != BADVAL && lon1 != BADVAL && lat2 != BADVAL && lon2 != BADVAL ) { diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c index 32bc6f812..50dc1619d 100644 --- a/gpsbabel/tmpro.c +++ b/gpsbabel/tmpro.c @@ -151,8 +151,8 @@ data_read(void) break; default: /* whoa! nelly */ - fprintf (stderr, "%s: Warning: data fields on line %d exceed specification.\n", - MYNAME, linecount); + warning(MYNAME ": Warning: data fields on line %d exceed specification.\n", + linecount); break; } i++; @@ -162,8 +162,8 @@ data_read(void) if (i != 11) { xfree(wpt_tmp); - fprintf (stderr, "%s: WARNING - extracted %d fields from line %d. \nData on line ignored.\n", - MYNAME, i, linecount); + warning(MYNAME ": WARNING - extracted %d fields from line %d. \nData on line ignored.\n", + i, linecount); } else { waypt_add(wpt_tmp); } diff --git a/gpsbabel/util.c b/gpsbabel/util.c index 2f9c98256..415b23440 100644 --- a/gpsbabel/util.c +++ b/gpsbabel/util.c @@ -308,6 +308,14 @@ fatal(const char *fmt, ...) exit(1); } +void +warning(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); +} + /* * Read 4 bytes in big-endian. Return as "int" in native endianness. */ -- 2.30.2